From dc7b818eba757da094ef361c7f5d31a8af212d4f Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Thu, 28 Apr 2016 17:23:08 +0200 Subject: [PATCH] Manually refreshed patches --- .../debian_apply-reproducible-date.patch | 6 +- debian/patches/debian_fixed-defines.patch | 14 +- .../debian_introjucer-modulepath.patch | 9 +- debian/patches/debian_make-introjucer.patch | 120 ++++++++++-------- debian/patches/reproducible-date.patch | 38 +++--- 5 files changed, 99 insertions(+), 88 deletions(-) diff --git a/debian/patches/debian_apply-reproducible-date.patch b/debian/patches/debian_apply-reproducible-date.patch index 5fdbfad4..d803b09a 100644 --- a/debian/patches/debian_apply-reproducible-date.patch +++ b/debian/patches/debian_apply-reproducible-date.patch @@ -5,12 +5,12 @@ Author: IOhannes m zmölnig Last-Update: 2016-02-10 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/extras/Introjucer/JuceLibraryCode/AppConfig.h -+++ juce/extras/Introjucer/JuceLibraryCode/AppConfig.h +--- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h ++++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h @@ -18,6 +18,7 @@ // [BEGIN_USER_CODE_SECTION] - // (You can add your own code in this section, and the Introjucer will not overwrite it) + // (You can add your own code in this section, and the Projucer will not overwrite it) +#include "../../../debian/libbuilder/build/libjuce_builddate.h" // [END_USER_CODE_SECTION] diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch index ee387871..5f3a5a53 100644 --- a/debian/patches/debian_fixed-defines.patch +++ b/debian/patches/debian_fixed-defines.patch @@ -12,10 +12,10 @@ Last-Update: 2016-04-07 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- juce.orig/modules/juce_core/juce_core.h +++ juce/modules/juce_core/juce_core.h -@@ -61,6 +61,32 @@ +@@ -70,6 +70,28 @@ + #include "system/juce_TargetPlatform.h" - //============================================================================= +/** Debian specific constants +Debian's libjuce.so only allows to either create +- a proper Release build @@ -38,13 +38,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +/** Debian specifics END +*/ + -+ -+ -+ -+//============================================================================= + //============================================================================== /** Config: JUCE_FORCE_DEBUG - Normally, JUCE_DEBUG is set to 1 or 0 based on compiler and project settings, --- juce.orig/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h +++ juce/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h @@ -22,6 +22,42 @@ @@ -90,9 +86,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ // The following checks should cause a compile error if you've forgotten to // define all your plugin settings properly.. -@@ -31,6 +67,7 @@ - #error "You need to enable at least one plugin format!" +@@ -37,6 +73,7 @@ #endif + #define JUCE_CHECKSETTINGMACROS_H + #ifndef JucePlugin_IsSynth diff --git a/debian/patches/debian_introjucer-modulepath.patch b/debian/patches/debian_introjucer-modulepath.patch index be031366..fc5779c7 100644 --- a/debian/patches/debian_introjucer-modulepath.patch +++ b/debian/patches/debian_introjucer-modulepath.patch @@ -4,14 +4,15 @@ Forwarded: not-needed Last-Update: 2015-01-28 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/extras/Introjucer/Source/Application/jucer_MainWindow.cpp -+++ juce/extras/Introjucer/Source/Application/jucer_MainWindow.cpp -@@ -577,5 +577,8 @@ +--- juce.orig/extras/Projucer/Source/Application/jucer_MainWindow.cpp ++++ juce/extras/Projucer/Source/Application/jucer_MainWindow.cpp +@@ -605,5 +605,9 @@ f = parent; } + File debian ("/usr/share/juce"); + if (isJuceFolder(debian)) + return debian.getChildFile ("modules"); - return File::nonexistent; ++ + return File(); } diff --git a/debian/patches/debian_make-introjucer.patch b/debian/patches/debian_make-introjucer.patch index b3b80b07..4db7764b 100644 --- a/debian/patches/debian_make-introjucer.patch +++ b/debian/patches/debian_make-introjucer.patch @@ -4,8 +4,8 @@ Author: IOhannes m zmölnig Last-Update: 2015-01-29 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/extras/Introjucer/Builds/Linux/Makefile -+++ juce/extras/Introjucer/Builds/Linux/Makefile +--- juce.orig/extras/Projucer/Builds/LinuxMakefile/Makefile ++++ juce/extras/Projucer/Builds/LinuxMakefile/Makefile @@ -8,6 +8,8 @@ CONFIG=Debug endif @@ -16,58 +16,58 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ BINDIR := build LIBDIR := build @@ -18,13 +20,13 @@ - TARGET_ARCH := + TARGET_ARCH := -march=native endif -- CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=4.1.0" -D "JUCE_APP_VERSION_HEX=0x40100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules -- CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=gnu++0x -Wreorder -Wuninitialized -Wunused-parameter -Wstrict-aliasing -Wshadow -Wsign-compare +- CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules +- CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 - CXXFLAGS += $(CFLAGS) -std=c++11 - LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl -+ JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=4.1.0" -D "JUCE_APP_VERSION_HEX=0x40100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS) -+ JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -Wreorder -Wuninitialized -Wunused-parameter -Wstrict-aliasing -Wshadow -Wsign-compare $(CFLAGS) ++ JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS) ++ JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 $(CFLAGS) + JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) -+ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L$(LIBJUCE_PATH) -ljuce_d $(LDFLAGS) ++ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl $(LDFLAGS) - TARGET := Introjucer + TARGET := Projucer - BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR) endif @@ -38,13 +40,13 @@ - TARGET_ARCH := + TARGET_ARCH := -march=native endif -- CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=4.1.0" -D "JUCE_APP_VERSION_HEX=0x40100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules -- CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=gnu++0x -Wreorder -Wuninitialized -Wunused-parameter -Wstrict-aliasing -Wshadow -Wsign-compare +- CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules +- CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 - CXXFLAGS += $(CFLAGS) -std=c++11 - LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl -+ JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=4.1.0" -D "JUCE_APP_VERSION_HEX=0x40100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS) -+ JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -Wreorder -Wuninitialized -Wunused-parameter -Wstrict-aliasing -Wshadow -Wsign-compare $(CFLAGS) ++ JUCE_CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules $(CPPFLAGS) ++ JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 $(CFLAGS) + JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) -+ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L$(LIBJUCE_PATH) -ljuce $(LDFLAGS) ++ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl $(LDFLAGS) - TARGET := Introjucer + TARGET := Projucer - BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR) endif -@@ -95,13 +97,6 @@ +@@ -97,13 +99,6 @@ $(OBJDIR)/jucer_NewFileWizard_fac97f47.o \ $(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \ $(OBJDIR)/BinaryData_ce4232d4.o \ -- $(OBJDIR)/juce_core_1ee54a40.o \ -- $(OBJDIR)/juce_cryptography_3b1f489a.o \ -- $(OBJDIR)/juce_data_structures_84790dfc.o \ -- $(OBJDIR)/juce_events_584896b4.o \ -- $(OBJDIR)/juce_graphics_f9afc18.o \ -- $(OBJDIR)/juce_gui_basics_90929794.o \ -- $(OBJDIR)/juce_gui_extra_b81d9e1c.o \ +- $(OBJDIR)/juce_core_75b14332.o \ +- $(OBJDIR)/juce_cryptography_6de2ebff.o \ +- $(OBJDIR)/juce_data_structures_72d3da2c.o \ +- $(OBJDIR)/juce_events_d2be882c.o \ +- $(OBJDIR)/juce_graphics_9c18891e.o \ +- $(OBJDIR)/juce_gui_basics_8a6da59c.o \ +- $(OBJDIR)/juce_gui_extra_4a026f23.o \ .PHONY: clean -@@ -110,11 +105,11 @@ +@@ -112,11 +107,11 @@ -@mkdir -p $(BINDIR) -@mkdir -p $(LIBDIR) -@mkdir -p $(OUTDIR) @@ -75,13 +75,13 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + $(BLDCMD) clean: - @echo Cleaning The Introjucer + @echo Cleaning Projucer - @$(CLEANCMD) + $(CLEANCMD) strip: - @echo Stripping The Introjucer -@@ -123,266 +118,266 @@ + @echo Stripping Projucer +@@ -125,276 +120,276 @@ $(OBJDIR)/jucer_AppearanceSettings_788d9889.o: ../../Source/Application/jucer_AppearanceSettings.cpp -@mkdir -p $(OBJDIR) @echo "Compiling jucer_AppearanceSettings.cpp" @@ -128,6 +128,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -@mkdir -p $(OBJDIR) @echo "Compiling jucer_OpenDocumentManager.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/projucer_CompileEngineClient_542e6b2d.o: ../../Source/LiveBuildEngine/projucer_CompileEngineClient.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling projucer_CompileEngineClient.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/projucer_CompileEngineServer_a5a32aa5.o: ../../Source/LiveBuildEngine/projucer_CompileEngineServer.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling projucer_CompileEngineServer.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp @@ -254,18 +266,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -@mkdir -p $(OBJDIR) @echo "Compiling jucer_PaintRoutine.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ProjectExporter.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -+ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - - $(OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ResourceFile.cpp" -- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(OBJDIR)/jucer_DependencyPathPropertyComponent_4d137229.o: ../../Source/Project/jucer_DependencyPathPropertyComponent.cpp @@ -286,15 +286,21 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/jucer_ProjectContentComponent_60de0eee.o: ../../Source/Project/jucer_ProjectContentComponent.cpp + $(OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ProjectExporter.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ProjectSaver_38b16c25.o: ../../Source/Project\ Saving/jucer_ProjectSaver.cpp -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ProjectContentComponent.cpp" + @echo "Compiling jucer_ProjectSaver.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/jucer_ProjectType_1bc27a24.o: ../../Source/Project/jucer_ProjectType.cpp + $(OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ProjectType.cpp" + @echo "Compiling jucer_ResourceFile.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" @@ -326,6 +332,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -@mkdir -p $(OBJDIR) @echo "Compiling jucer_MiscUtilities.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" ++ $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + + $(OBJDIR)/jucer_ProjucerLookAndFeel_d6c6b28a.o: ../../Source/Utility/jucer_ProjucerLookAndFeel.cpp + -@mkdir -p $(OBJDIR) + @echo "Compiling jucer_ProjucerLookAndFeel.cpp" +- @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o: ../../Source/Utility/jucer_SlidingPanelComponent.cpp @@ -358,52 +370,52 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_core_1ee54a40.o: ../../../../modules/juce_core/juce_core.cpp + $(OBJDIR)/juce_core_75b14332.o: ../../JuceLibraryCode/juce_core.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_core.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_cryptography_3b1f489a.o: ../../../../modules/juce_cryptography/juce_cryptography.cpp + $(OBJDIR)/juce_cryptography_6de2ebff.o: ../../JuceLibraryCode/juce_cryptography.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_cryptography.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_data_structures_84790dfc.o: ../../../../modules/juce_data_structures/juce_data_structures.cpp + $(OBJDIR)/juce_data_structures_72d3da2c.o: ../../JuceLibraryCode/juce_data_structures.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_data_structures.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_events_584896b4.o: ../../../../modules/juce_events/juce_events.cpp + $(OBJDIR)/juce_events_d2be882c.o: ../../JuceLibraryCode/juce_events.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_events.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_graphics_f9afc18.o: ../../../../modules/juce_graphics/juce_graphics.cpp + $(OBJDIR)/juce_graphics_9c18891e.o: ../../JuceLibraryCode/juce_graphics.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_graphics.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_gui_basics_90929794.o: ../../../../modules/juce_gui_basics/juce_gui_basics.cpp + $(OBJDIR)/juce_gui_basics_8a6da59c.o: ../../JuceLibraryCode/juce_gui_basics.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_gui_basics.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/juce_gui_extra_b81d9e1c.o: ../../../../modules/juce_gui_extra/juce_gui_extra.cpp + $(OBJDIR)/juce_gui_extra_4a026f23.o: ../../JuceLibraryCode/juce_gui_extra.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_gui_extra.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -include $(OBJECTS:%.o=%.d) ---- juce.orig/extras/Introjucer/JuceLibraryCode/AppConfig.h -+++ juce/extras/Introjucer/JuceLibraryCode/AppConfig.h -@@ -44,7 +44,7 @@ +--- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h ++++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h +@@ -50,7 +50,7 @@ #endif #ifndef JUCE_LOG_ASSERTIONS diff --git a/debian/patches/reproducible-date.patch b/debian/patches/reproducible-date.patch index da479e50..6dc30521 100644 --- a/debian/patches/reproducible-date.patch +++ b/debian/patches/reproducible-date.patch @@ -7,7 +7,7 @@ Last-Update: 2015-01-21 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- juce.orig/modules/juce_core/time/juce_Time.cpp +++ juce/modules/juce_core/time/juce_Time.cpp -@@ -448,10 +448,13 @@ +@@ -598,11 +598,14 @@ return 0; } @@ -16,29 +16,31 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +#endif Time Time::getCompilationDate() { - StringArray dateTokens; + StringArray dateTokens, timeTokens; + - dateTokens.addTokens (__DATE__, true); + dateTokens.addTokens (BUILD_DATE, true); dateTokens.removeEmptyStrings (true); - return Time (dateTokens[2].getIntValue(), ---- juce.orig/extras/Introjucer/Source/Application/jucer_Application.h -+++ juce/extras/Introjucer/Source/Application/jucer_Application.h -@@ -101,13 +101,16 @@ - return initialiseLogger ("log_"); - } + timeTokens.addTokens (__TIME__, ":", StringRef()); +--- juce.orig/extras/Projucer/Source/Application/jucer_Application.cpp ++++ juce/extras/Projucer/Source/Application/jucer_Application.cpp +@@ -130,6 +130,9 @@ + icons = new Icons(); + } +#ifndef BUILD_DATE +# define BUILD_DATE __DATE__ +#endif - bool initialiseLogger (const char* filePrefix) - { - if (logger == nullptr) - { - logger = FileLogger::createDateStampedLogger (getLogFolderName(), filePrefix, ".txt", - getApplicationName() + " " + getApplicationVersion() -- + " --- Build date: " __DATE__); -+ + " --- Build date: " BUILD_DATE); - Logger::setCurrentLogger (logger); - } + bool ProjucerApplication::initialiseLogger (const char* filePrefix) + { + if (logger == nullptr) +@@ -142,7 +145,7 @@ + + logger = FileLogger::createDateStampedLogger (folder, filePrefix, ".txt", + getApplicationName() + " " + getApplicationVersion() +- + " --- Build date: " __DATE__); ++ + " --- Build date: " BUILD_DATE); + Logger::setCurrentLogger (logger); + } -- 2.30.2